From 8e45e15a118769a87f6688aad6d60bc8dd226846 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 16 Apr 2020 17:08:31 -0400
Subject: [PATCH] colorchooser: Fix a crash

Don't crash when we start removing custom colors
that happen to be currently selected.
---
 gtk/gtkcolorchooserwidget.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index a6b3c5cc53..5dbb3b1aa4 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -794,6 +794,9 @@ add_custom_color (GtkColorChooserWidget *cc,
     {
       GtkWidget *last = gtk_widget_get_last_child (cc->custom);
 
+      if (last == (GtkWidget *)cc->current)
+        cc->current = NULL;
+
       gtk_container_remove (GTK_CONTAINER (cc->custom), last);
     }
   g_list_free (children);
-- 
2.30.2